how to resolve conflict

visit shbcf.ru